-
Notifications
You must be signed in to change notification settings - Fork 372
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pebble Rebased #124
Pebble Rebased #124
Conversation
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Carolyn3114 <[email protected]>
Signed-off-by: Carolyn3114 <[email protected]>
My cursory observations/requests:
|
why remove the autolathe in science? |
thar |
Because they want people to rely on other departments |
Just leave a tool box for them |
Also give them their mass media thing |
where's the reporter's room? |
Fun fact, there isn't |
then they won't get a mass media console |
I think this is in a pretty good condition now |
fixed |
@IamVelcroboy Let me know when this is ready to merge. |
I kinda figured. I just noticed it though. Seems odd. 🤷 |
Once this gets merged i might start working on rock station |
Did this get ninja bombing objectives / nav beacons added? |
done |
I'll merge this after I take a look at it in-game real quick. |
wtf lol nevermind I didn't pull the newest one |
got em |
Made Pebble the small-pop map
Adjusted the min population of Edge in this PR because it was 0. It is now 15. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Velcro said it's okay plus I checked it, so we mergin
## Mirror of PR #25819: [Fix chromite chasm sprite](space-wizards/space-station-14#25819) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `2a5be69898b8a0f3750c860e69cce1c819518af2` PR opened by <img src="https://avatars.githubusercontent.com/u/62609550?v=4" width="16"/><a href="https://github.com/Ko4ergaPunk"> Ko4ergaPunk</a> at 2024-03-04 01:30:44 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-08 23:48:03 UTC --- PR changed 20 files with 0 additions and 0 deletions. The PR had the following labels: - No C# - Changes: Sprites - Status: Awaiting Changes --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > Nothing personal, Ed. > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > ![chromite](https://github.com/space-wizards/space-station-14/assets/62609550/0fbdf7eb-d682-4f0e-afaa-cd7e400bdfdb) > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > </details> Co-authored-by: Ko4ergaPunk <[email protected]>
# Description Re-adds CMO Turtleneck to the loadout (I swear to fucking god if I have to re-add it again I am going to commit many war crimes) --- # TODO - [x] turtle neck 👍 # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: CMO Turtleneck back to loadout
About the PR
Rebases pebble, with all the goodies ( I Think)
Why / Balance
Lowpop map
Technical details
peble
Media
PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
Small fixes/refactors are exempt.
Any media may be used in SS14 progres
s reports, with clear credit given.
If you're unsure whether your PR will require media, ask a maintainer.
Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
-->
Breaking changes
Changelog